$OpenBSD: patch-chrome_browser_media_galleries_media_file_system_registry_cc,v 1.11 2017/04/28 22:22:36 robert Exp $
--- chrome/browser/media_galleries/media_file_system_registry.cc.orig.port	Wed Apr 19 21:06:29 2017
+++ chrome/browser/media_galleries/media_file_system_registry.cc	Thu Apr 27 19:55:59 2017
@@ -758,7 +758,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI
 // Constructor in 'private' section because depends on private class definition.
 MediaFileSystemRegistry::MediaFileSystemRegistry()
     : file_system_context_(new MediaFileSystemContextImpl) {
-  StorageMonitor::GetInstance()->AddObserver(this);
+  /*
+   * This conditional is needed for shutdown.  Destructors
+   * try to get the media file system registry.
+   */
+  if (StorageMonitor::GetInstance())
+    StorageMonitor::GetInstance()->AddObserver(this);
 }
 
 MediaFileSystemRegistry::~MediaFileSystemRegistry() {
